Avoid errors when removing the plug from the socket. (#128546, Christopher

Thu Feb 19 00:32:21 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkplug.c (_gtk_plug_remove_from_socket): Avoid errors when
	removing the plug from the socket.  (#128546, Christopher Blizzard)

diff --git a/ChangeLog b/ChangeLog
index ca8ec6f6d13b029358ee07b88295dceb6ee6f1b7..3795cc1dea127276bee419aa27051a02737051df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 19 00:32:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkplug.c (_gtk_plug_remove_from_socket): Avoid errors when
+       removing the plug from the socket.  (#128546, Christopher Blizzard)
+
 Thu Feb 19 00:09:35 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkradiomenuitem.h:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ca8ec6f6d13b029358ee07b88295dceb6ee6f1b7..3795cc1dea127276bee419aa27051a02737051df 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Feb 19 00:32:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkplug.c (_gtk_plug_remove_from_socket): Avoid errors when
+       removing the plug from the socket.  (#128546, Christopher Blizzard)
+
 Thu Feb 19 00:09:35 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkradiomenuitem.h:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ca8ec6f6d13b029358ee07b88295dceb6ee6f1b7..3795cc1dea127276bee419aa27051a02737051df 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Feb 19 00:32:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkplug.c (_gtk_plug_remove_from_socket): Avoid errors when
+       removing the plug from the socket.  (#128546, Christopher Blizzard)
+
 Thu Feb 19 00:09:35 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkradiomenuitem.h:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ca8ec6f6d13b029358ee07b88295dceb6ee6f1b7..3795cc1dea127276bee419aa27051a02737051df 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Feb 19 00:32:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkplug.c (_gtk_plug_remove_from_socket): Avoid errors when
+       removing the plug from the socket.  (#128546, Christopher Blizzard)
+
 Thu Feb 19 00:09:35 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkradiomenuitem.h:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ca8ec6f6d13b029358ee07b88295dceb6ee6f1b7..3795cc1dea127276bee419aa27051a02737051df 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Feb 19 00:32:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkplug.c (_gtk_plug_remove_from_socket): Avoid errors when
+       removing the plug from the socket.  (#128546, Christopher Blizzard)
+
 Thu Feb 19 00:09:35 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkradiomenuitem.h:

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index a6efb9029a0e4d89e9ea4236386cb97bbed9b694..f9c2f2bc14d90c643c67b7b2d2a9cc40b436e4b9 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -296,8 +296,11 @@ _gtk_plug_remove_from_socket (GtkPlug   *plug,
   GTK_PRIVATE_UNSET_FLAG (plug, GTK_IN_REPARENT);
   
   socket->plug_widget = NULL;
-  g_object_unref (socket->plug_window);
-  socket->plug_window = NULL;
+  if (socket->plug_window != NULL)
+    {
+      g_object_unref (socket->plug_window);
+      socket->plug_window = NULL;
+    }
   
   socket->same_app = FALSE;